Merge tag 'upstream/2016.6' into debian/master
authorSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:12:28 +0000 (12:12 +0100)
committerSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:12:28 +0000 (12:12 +0100)
commit051e7acbe2274718e031090c28cc090e1ede7fbc
treebb6c225f32627ff974127185aa062a27604af207
parentdcf46b2b5ecc7f3874618ecb78e86152fcca9ec9
parent24762929e21d7291f9d98fb0e060fca23f1f5173
Merge tag 'upstream/2016.6' into debian/master

Upstream version 2016.6